From bf69ab9d687ec505aa6d51fbcf8c2470ce25bd8b Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 16 Sep 1998 23:33:25 +0000 Subject: [PATCH] Test whether type is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before 1998-09-16 Federico Mena Quintero * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that (widget != NULL), otherwise radio button insertion will not work -- the widget argument is NULL for the first radio button in the group. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtktoolbar.c | 2 +- 8 files changed, 64 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5b54c5308c..88c48a3d38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1998-09-16 Federico Mena Quintero + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type + is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that + (widget != NULL), otherwise radio button insertion will not work + -- the widget argument is NULL for the first radio button in the + group. + Tue Sep 15 13:09:24 1998 Owen Taylor * gdk/gdkimage.c (gdk_image_new): Reverted global changes @@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson free()s. X itself uses free() on some of the malloced memory. +>>>>>>> 1.633 Sat Sep 12 10:44:06 1998 Owen Taylor * gtkfilesel.c: Maintain a list of directories like diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5b54c5308c..88c48a3d38 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +1998-09-16 Federico Mena Quintero + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type + is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that + (widget != NULL), otherwise radio button insertion will not work + -- the widget argument is NULL for the first radio button in the + group. + Tue Sep 15 13:09:24 1998 Owen Taylor * gdk/gdkimage.c (gdk_image_new): Reverted global changes @@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson free()s. X itself uses free() on some of the malloced memory. +>>>>>>> 1.633 Sat Sep 12 10:44:06 1998 Owen Taylor * gtkfilesel.c: Maintain a list of directories like diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5b54c5308c..88c48a3d38 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +1998-09-16 Federico Mena Quintero + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type + is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that + (widget != NULL), otherwise radio button insertion will not work + -- the widget argument is NULL for the first radio button in the + group. + Tue Sep 15 13:09:24 1998 Owen Taylor * gdk/gdkimage.c (gdk_image_new): Reverted global changes @@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson free()s. X itself uses free() on some of the malloced memory. +>>>>>>> 1.633 Sat Sep 12 10:44:06 1998 Owen Taylor * gtkfilesel.c: Maintain a list of directories like diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5b54c5308c..88c48a3d38 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +1998-09-16 Federico Mena Quintero + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type + is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that + (widget != NULL), otherwise radio button insertion will not work + -- the widget argument is NULL for the first radio button in the + group. + Tue Sep 15 13:09:24 1998 Owen Taylor * gdk/gdkimage.c (gdk_image_new): Reverted global changes @@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson free()s. X itself uses free() on some of the malloced memory. +>>>>>>> 1.633 Sat Sep 12 10:44:06 1998 Owen Taylor * gtkfilesel.c: Maintain a list of directories like diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5b54c5308c..88c48a3d38 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +1998-09-16 Federico Mena Quintero + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type + is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that + (widget != NULL), otherwise radio button insertion will not work + -- the widget argument is NULL for the first radio button in the + group. + Tue Sep 15 13:09:24 1998 Owen Taylor * gdk/gdkimage.c (gdk_image_new): Reverted global changes @@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson free()s. X itself uses free() on some of the malloced memory. +>>>>>>> 1.633 Sat Sep 12 10:44:06 1998 Owen Taylor * gtkfilesel.c: Maintain a list of directories like diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5b54c5308c..88c48a3d38 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +1998-09-16 Federico Mena Quintero + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type + is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that + (widget != NULL), otherwise radio button insertion will not work + -- the widget argument is NULL for the first radio button in the + group. + Tue Sep 15 13:09:24 1998 Owen Taylor * gdk/gdkimage.c (gdk_image_new): Reverted global changes @@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson free()s. X itself uses free() on some of the malloced memory. +>>>>>>> 1.633 Sat Sep 12 10:44:06 1998 Owen Taylor * gtkfilesel.c: Maintain a list of directories like diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5b54c5308c..88c48a3d38 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +1998-09-16 Federico Mena Quintero + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): Test whether type + is not equal to GTK_TOOLBAR_CHILD_RADIOBUTTON before checking that + (widget != NULL), otherwise radio button insertion will not work + -- the widget argument is NULL for the first radio button in the + group. + Tue Sep 15 13:09:24 1998 Owen Taylor * gdk/gdkimage.c (gdk_image_new): Reverted global changes @@ -55,6 +63,7 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson free()s. X itself uses free() on some of the malloced memory. +>>>>>>> 1.633 Sat Sep 12 10:44:06 1998 Owen Taylor * gtkfilesel.c: Maintain a list of directories like diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 8457d6c7de..4970cbabd7 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -743,7 +743,7 @@ gtk_toolbar_insert_element (GtkToolbar *toolbar, g_return_val_if_fail (widget != NULL, NULL); g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); } - else + else if (type != GTK_TOOLBAR_CHILD_RADIOBUTTON) g_return_val_if_fail (widget == NULL, NULL); child = g_new (GtkToolbarChild, 1); -- 2.30.2